Third WC commit
Fix merge conflict