diff --git a/assets/js/EditProfile.jsx b/assets/js/EditProfile.jsx
index 93f7f6a7a62db304b1fa8fcb09d4daee8e058b2a..198955f553727cceff37cea6bab9580191782ada 100644
--- a/assets/js/EditProfile.jsx
+++ b/assets/js/EditProfile.jsx
@@ -423,20 +423,12 @@ export default class ProfilePage extends React.Component {
               />
             </Form.Field>
             <Form.Field>
-<<<<<<< HEAD
               <label htmlFor="github_url">URL Profile Github</label>
               <input 
                 onChange={this.handleChange} 
                 placeholder={this.state.github_url === null ? "https://github.com/bob" : this.state.github_url}
                 defaultValue={this.state.github_url === null ? null : this.state.github_url}
                 name="github_url" 
-=======
-              <label htmlFor="linkedin_url">URL Profile Github</label>
-              <input
-                onChange={this.handleChange}
-                placeholder="https://github.com/bob"
-                name="github_url"
->>>>>>> bc54b30058ea101246718eb866c859d689575629
               />
             </Form.Field>
             <Form.Field>
@@ -469,16 +461,10 @@ export default class ProfilePage extends React.Component {
             </Form.Field>
             <Form.Field>
               <label htmlFor="skills">Skills</label>
-<<<<<<< HEAD
               <input 
                 onChange={this.handleChange} 
                 placeholder="Isi sesuai dengan keahlian anda" 
                 defaultValue={this.state.skills === null ? 'Competitive Programming' : this.state.skills}
-=======
-              <input
-                onChange={this.handleChange}
-                placeholder="Isi sesuai dengan keahlian anda"
->>>>>>> bc54b30058ea101246718eb866c859d689575629
                 name="skills"
               />
             </Form.Field>
@@ -617,17 +603,8 @@ export default class ProfilePage extends React.Component {
               />
             </Form.Field>
             <Form.Field>
-<<<<<<< HEAD
               <label htmlFor="expected_salary">Expected Salary</label>
               <input onChange={this.handleChange} placeholder="2000000" name="expected_salary" />
-=======
-              <label htmlFor="phone_number">Expected Salary</label>
-              <input
-                onChange={this.handleChange}
-                placeholder="2000000"
-                name="expected_salary"
-              />
->>>>>>> bc54b30058ea101246718eb866c859d689575629
             </Form.Field>
             <Form.Field>
               <label htmlFor="intro">Intro</label>