stupid merge not working