Fixing GIT and Local conflict.