prepare for remote merge
editing git ignore
returning cms overwrite