working with fornt-end
fix conflics home vs work