solved merging error (different naming)