Fixed merge conflicts in noise shader