Remove GIT conflicts from source