Modifications to get rid of merging errors.