Adding all change
ADding final merge
pushing most recent changes