Fixed GIT conflicts