Fixed Merge Bug...