[TASK] Move property merge behavior