The user can now resolve merge conflicts

View for resolving merge conflicts implemented
Document will not be saved automatically anymore when trying to compile