Fixed Git Conflict