[~BUGFIX] Cleaned up the merge