Merge commit
Fixed merge commit