Fixes rebasing pull