Started a fake merge conflict.