editan filebaru
fixed conflict