changed merge a bit (comments still broken)