fixed the merging errors :)