start using field selector
fix conflicts