pushing changes after merging master changes