fixed issues with last merge