Comitting for merge

To avoid big merge conflicts