Solved queries.c conflict