Clean up some merge junk, commit tiledef changes.