rebase conflict fixed, 4

Conflict fixed in master