Cleaned up nasty merge conflict