merging two last commits