remove warning di shape
button pake shape
resolving conflicts