cleaning up before repulling
fixed merge conflicts
fixed merge conflicts thanks hussain