Fixing my merge... First time git user