Fixing my noob merge mistakes T-T