fixed more commit and merge issues