fixed: git merging errors