Cleaned conflictive files to commit