having merge issues hope to fix.