Wait, why did you merge if it wasn't working? XD