Removed remains of prev merge conflict