[TASK] Updated changes and added not committed test for rewrite conflict command.