ga ngerti cara benerin conflict, jadi coba nge commit