Completed the merge so it can actually run