Fixed another merging error