custom object done
done
Done with merge issues fixed