commiting changes I forgot to commit..
fixed conflicts