lol committed with my shell
gdi these merge errors