Resolved rebase conflicts