Fixed invalid merge???