Fixed conflicts in last commit