fixed that damn ass problem with the merge