fixed couple merge issues