Bugfix after resolving conflicts