post merge fixing