remove conflict on master