Fixing some commit issues
fixed merge