Fixing my merge fail