marker schema added
fixed some merge bugs