Its not mergin bro

Fix it James