Committing for the sake of ocmmitting
Commit fixed merge issues