Fix commits conflict