merging old commit with current master