Removed conflicted file