conflict commit with my name