final merge issues, really messed that up