Fixed issue with bad merge