Fixed merge conflicts in procedures