Removed pushed git conflict