diff --git a/example/App.js b/example/App.js
index 85ad86c..79ec2a8 100644
--- a/example/App.js
+++ b/example/App.js
@@ -1,11 +1,6 @@
 import React from 'react';
-<<<<<<< HEAD:expoexample/progresschart/ProgressChart.js
-import { AppRegistry, Button, StyleSheet, Text, View, PanResponder } from 'react-native';
-import { AnimatedCircularProgress } from 'react-native-circular-progress';
-=======
 import { StyleSheet, Text, View, PanResponder } from 'react-native';
 import { CircularProgress, AnimatedCircularProgress } from 'react-native-circular-progress';
->>>>>>> Update expo example:example/App.js
 
 const MAX_POINTS = 500;