Fixes the GIT Conflict