Fixed conflicts with latest merge